Changed ordering of classes