more waldorf.c