Finish the Demo_app