TECH: tweak the structure to be more familiar.