Add experimental 2bwm detection