More integration of @callahad's copy