performance improvements to parse