Updates to the GM Tool