Beginning of complete overhaul