Updated Client Stuff