Interceptor rework