Added Rudimentary collision prevention