Updated the way that settings work