edits from Rhiannon as per #8