Merge task 5 and 3