improve the Interceptor