Add code to advance state and timing info for debugging