first overhaul commit