adding bait and collision checking