added rotating code that doesn't work
fixed merge conflict