Side collisions
Merge https://github.com/rusko248/ps-master-Pam