updated demos and template