Removed copying, speeding up while reducing space usage