changed some structures