Updated, added Regular Expressions