Fixed portion of Task 1