Revert "Simplify trapped rook code"

This reverts commit 13b536f71a085cad86a24281db8a056fb3e7d949.
Just adjust threshold