update info on dev
merge to dev