Switched to using buffers instead of tabs