little more unifying on the client control