tiny perf boost and interceptor update