Working on some changes to intercepting