Waiting on Yami again