interceptor very unstable
changes to Makefile
changes to interceptor code