Changed collisions back to how they were before

Will come back to them when I'm less sick of them.