refactor to new model
merge, obj not work now