Model upated

Not stable, not tested