litte changes in Order class