rework some personalizations