Simplifying Demo impl