adapt model to probable final version
Adapt model to probable final version