restructured  model (described in github issue)