rejig [ci skip]