rotation added, not debugged