Merged Anna's changes by hand since git was having problems.