minor change to output ordering