some changes for ji kun encounter