Improve the order model