Fixed delete issue. Working 2nd pass estimation