Update with assignament 6