add commit and swap order