Initial overhaul