wip3: fixed xp?