Working update to server and app.