huge overhaul on design