Add isNow checking