updated timing infrastructure