Non working part of the demo into main branch