start to fix overlap