Add overlap logic and warning