Revised Demo app