we change it to class

more comfortable
test