done some stuff for excercise 2