Gonna change structure of the rotation handling