edited to format