draft updated after Jori's comments