Updating regex
Fixing markup