Tick tock, giver refactoring