Extended the trap interception switch