incorporate Tobi's edits