Incorporating review comments from Kaustubh