Updated demo with new implementation
Removed old implementation