add new classes
merging