Geiri and Makarius New/changed