Final changes to Interception.