finishing off the overhaul