Changed RegExp statements