Updated GAPP