Added regex? to checks