Updated with critical edition advanced compatibility.