reorganized structure to make more sense