Worked on the regex-replace...