Updated Client Code