Should the axis permutation also be part of this?