FIX ENH: Example + addressing Alex's comments