improve interceptor