changed structure to be more typical