added better regex performance