modification for overlapping issue