changes in shipping and order model