modified demo project