Improved demo