edits from Jane's Stuff