More updates suggested by Anna.