Changes to build a demostrator