changed now to current and time to now