The second commit -- Alice's changes (and my own) updated