Refactor, add @@now.