Updated GAPP with hack for craigmiller