Adding some other changes