more of Susan's changes