Added the current time condition back