updated Order class