Changed Time.now to Time.current