Yami's back! (Updated)