Expanding to support some demos.