bug fixed.
bug fixed.(now the refractoring is partly over.)