More examples, refactored