Final touches for demo