Another attempt at fixing the timeline