Major overhaul in progress