Changed the timing feature to be more inclusive