added carme/waldo locations