Update from Thomas Klausner.