Add more timing and stats