Added overlap check