schema updated and tested