added some parsing