More reworking on the Beauty part.