removed model/controlled... all this should be in gauss