Updates to get running on new Clients