changed the Order class