Changes to get axis working