#67 Change model