Changed how join works to include an internal buffer.