db and model modification
pull from master
updated tests
updated tests