change to class
merge