initial commit of modified demo code