Updated GWA Calculator