added changes for demos