Updated Client app