Demo app fixed