major design update