Moved to use LE buffering