task 5 & task 6 added