minor changes from client