Finished part 1 phase A