minor tweaking for demo