catchup commit, with a bunch of changes