Update for Caustic and Client

Thanks @waterpicker