Making XP better (Part 1)