All tests passed. Changed parseLookup/build*