Adding self-contained things like the configuration by parameter options next time please is done in a separate patch