modify struct State
merge yoshida yoshida works