Tweaks to intercept code