changed parsing again