Added overlap detection