more work on the interceptor
merged the stupid changes