AJP modifications May 19, 5:56 PM