Updates to Solari and Stock Tag