added 6.25 ~ 6.29