Updated Client JS