Including the amendments made by the June 2018 convention, with changes for the sake of consistency.