Small update
Improved code for mock demo