catchup commit before some bugfixing with tests