Refactor cr process