Need to remove possible intersections on add as well as update