pull request change

Ajoy please look over these changes