Done. See updated PR