Grubbed additional settings from Joe's repo