More updates to demo