Completed task 39, updated task 40