Changed parsing again.