suggestions from #10