Refactor the timeline a lil bit.