Touchup for Demo V0.2