New model logic a architecture
Resolved conflicts in new model version