getting closer to refactor release