update to use Model