some rearranging of classes