changed @demobox suggestions