Small improv on XP aside