Added crude collision detection