Rafi done the changes

Rafi done the changes