fixes #2 - MyWork - improve the format of the buffer