additions to improve perf