fixed up to task 15