Updated vipergen