refactored intercept extensions