address other @demobox's comments