More updates to part 1