ACADEMY:  model fixes