major design improvements