Handling for overlaps, to be incorporated