changes for running on this computer
merge and fix model to run