Changed the check for no bait. Needs major improvements.