Changed rotate, changed drawing method