most of the changes done