Some additional changes (pending rotation abilities).