re-done the excercises