Added some small changes to Intercept, it works a little better now