added rotation and aa