updates to make sure that demo app works correctly