added better regex