改為普通Class，加入進度類別
Merge branch '18-medium-class' into develop