Replaced unrolled buffer with a custom-tailored data structure.
Merge branch 'eval'