Added rotation and circle-box contact