re-edited comments