Added some better rotation