Exercise1: update, almost done