updated working app