Implemented and tested model/update