Minor changes in solution for task #18