Added escape event detector