added some more parsing