fix origo moving
wip