Yakibot changes