Got regular expressions fixed.
Updated prior to transfer