Added small changes Part 2