Edited the Order class