changes to script and model