Updates to rotation and grid placement