Fixing demo, second try