couple of stragglers to be removed and modified