ADD new classes and more orden