Major changes done