modify parse and count