- Change axes to correct order
- Eliminate roll entry of axes data