Update from conversion process Part 1