Many changes done