changed parsing a bit