fixed part of exercise 1