Changed some RegExp