changes done in abilash merged