- merged performance updates from S. Nordhausen