simplified the hierarchy