Demo improoved