With JBF edits