Updated Client