Different line in temp
Merging changes from GitHub