Made comment for setting clearer
Merged conflicts