beta version
refactor