Suggestions from #16