Completed changes for part 1