Include edits suggested by Jess