commit
Exercise 4&5