regex changes to target 1.6 (no named groups)