Axis adjusted and data structure simplified