add yotanami commit with some changes