rearranged some feature classifications