fix the issue with "happening now" to match the requirements