Demo enhancements.