Finish implementing time advancement