Complete Overhaul v2