rejig order [ci skip]