rebuild the construction of ryota
fixed