add more parsing