Minor changes to decrease the size of the code
merge conflict solved