main changes done