change to correct parsing structure