Converting to new demo system.