in progress work for model v2