rearrange commit 3?