Some other changes from client 2