modify according to the comments, format change