Few upgrades to the GS "chart"