better naming and check for YOYAKU