Final version of demo app