task5 requiring small fixes