Refine handling of GWA case 1