Changed the hierarchy