Fixed Part 1a, Completed Part 1b