improved demo mode