Modified rotation detection + fixed some bugs -> presentation version