Some more fiddling with the GAPs