Revisions asked by Johann