Changes as per Benedikt email Oct20