A few more collide changes, time to go to math now...