added last changes to interception