Added Waldo and Carmen