Improvements, demo-ready