the real right stage for refactor