changed ordering of output