Sweta's code

Rashmi, 

Can you merge my code to Master.