Made some changes to both files