Merge in Alice's changes