major overhaul but still no luck