Added some more calls to intercept.