Update 4 (finish) and task 5 added