major update to model and paper