Made some changes to files