Merged task 1