homogenise args & new output structure