Final touches for the demo