New model

see #38