Changed Main, plus changes on the Model.