Applying @moira's changes to on_context.md