Changed order of classes