made a few heirarchical changes