Slight changes, next step: enable new axis remove old code