Regex and sys changes