reorganized the attributes