Optimized collisions
Restructured a bit