Task 1 and 2 source update