wip on fix for rotation issues