Adding buffered version...