among others, update to new parsing model