User dest model

fixed merge conflict and update master branch