fixes to model again.