Demo updates
configuration updates