Modified as per Part2