simplify the update model a bit