Can we rename 'client' to something more specific? maybe fromClient?