Refactored timeline