Before modifying modelstate.js