Add improvement for the basic demo