fixed task 2, 4