incorporate Jarred edits