refactoring
merge O_o