Added a collision clause

Changed 4 classes which use this new clause