Correct regex
Add additional checks