Finishing the demo application