Committing Master Settings

Need to be revisited