Make demo working.