added regex to extract info