Moving to  module instead of cutomer buffer concatenation.