classes rearranged