140616 #2 buffer added