tidied settings up:
Rearranging some variables
Merge