incorporating more of Suzanne's changes