Changed some regex