Reverting for part1
Reverted back to part2