Refactor time round 1