Modifying some lines to see if they are merged
Merging changes