changed to base client and sensor