updated with formatting