Update Excercise 4 and 6