Refactored re processing as object.