Doing this for a client as was