add classes and some changes