before distance calc change
collision fix, lot of tests to adjust =(