Changes from Vinay

Changes from Vinay