Done: New Hiarchy of Entry