Small demo improvement