fixed all to time.now