finished excercise 35 and fixed bug