Some changes that I made