Added a smarter ambush