Issue #90 checklist