removed slow regular expressions