Refactor and timeline change (in progress)