Revert "Revert "fixed collision system""

This reverts commit 8172c05f1e101b8fe58b06aba3f7d2d8f78d9f46.