Updating to store pions as well