Demo improved