reorganized the features