(Update from Nexus using text editor and SGit) implementing new idea for collision detection