Merged Personalization part from Paul's repository