Trying to implement catchup