Change app, add better index