Done with the hierarchy modification