Rearrange a little otherwise no change