Prototype demo enhanced