changed some more sir