Demo app final commit