changes done by Garvit restored