Changed hierarchy of madeline13