a minor changes to client