Updated for scalability and new demo