Updates by Buerkert-Contromatic