wip
demo app updates