Last draft, removed regular expressions