Last changes for the demo