overhaul consisting of sorely needed design fixes