lock, and rearrange a bit.