fixing buffer names
adding collect text code