changed order of classes