working on fixing rotation proplem