move xpdr stuff about