major overhaul in progress