Updated Comments and REGEX2