Working on the GWE pt2