Started fixing rotation issues