overhaul fix attemp