very minor adj, start to add hierarchy lookup