Change order of class inclusion