Update 'when' blocks to reflect intercepting nature