use new parsing instead of regexp