Task 5 pt2
Some changes