Updated Clients and Controllers