started redoing parsing