parsing correctly now