fixed collision part1... ready for testing