Collision detection fixed
Backup
C++ 11