Overlap refactoring