removed log and attribution
Improved Regex