total rehaul. SOme things were changed, some weren't.