regexing added