merged and changes done