Update 1

exercise 1.1 & 1.2