closes #386 xp changes