Demo enhanced