Removed possible big data copying
less big data copying