refractored timeline