merged in new exercises for week 3