BypassTrap 2.0