refactor for release version