Homework1, fix for task13 and task15