Update with less redundency