Some changes done by me