Made some changes

Changes