rearranged classes