Changes to client