changed parsing style