breaking off from code.google repo