first commit of task_8.1 and task_9.1