new version of catchup working
made finish a bit easier