redesigned order model and order service