last changes for demo app