GW fixed and tested (seems ok)