Start of making the modulating model generic