rotation issues fixed