almost finish overhaul