Changed parsing style