Fixed most of collisions, some minor issues remain