merging the model from the monolothic branch