Adapted demo app