hand merging suggestions from @kwerle