Couple of changes to allow for some performance analysis.