Some interim changes. Trying to find perf issue.