Added to Baldur's fork