Updated the passed to be the same throughout the app
Merge remote-tracking branch 'origin/master'