Added axis selection and correction