Revert "new model - revert"

This reverts commit 510618c369abf954c926212bd15d9fd1c7de5d6f.