Regex for 3 cases added