Updated regexp again