Updated timing schema