Order class corrected