fixed draft4 changes to optional/format