Folded into single buffer, added color