add classes and modification