added regular expressions