update demo with helpers