Many changes done

Many changes done