Advanced Settings + minor modifications