refactor model_restricted
fix bug
Merge pull request #656 from YaleSTC/655_requirements_n+1

655 requirements n+1