task04, task 07 added