some edits from Annette