addresses comments from @demobox