model changes 2, all tests ok