rearrange a bit [ci skip]