updated Waldo