Upgraded yaidom