Improved demo settings