demo enhancements