beautyfication fix from version 3 attempt 3