updated client for callback FIX