revert back to the approach of copying into new objects as it's faster.