added back basic demo and some new features