Now with more time awareness