Addressed Naren's comments