updated both waldorfs