expanded parser