Updated some class By MACZ