sync commit, WIP!