WIP: Use minimum buffers.

TODO:  Need to review failng testcase.

Derivative values seem to be wrong.

Change-Id: I216c1108853d87378de2773b653d8ccd1e1fd505