timeline handling for rollover & revert

needs testing. #366 #355