Latest round of changes for demo app