adding in waldo and carmen