Add rotation and state
Add rotation and state