db and model modification
pull from master