Added a couple of settings