remaining functionality for demo