latest changes for demo1