Completed 2 except update