Demo improvement