More tweaking of XP formula