Revised regex