refactor for new version