before merge from shirui