Move to Box group Support more than one row of equipement Move defaults to arguments to conform with general coding style