cleaned dragging and tested rotation