Added the settings requested by Neil