Finishing demo app