AJP modifications May 19, 12:42 PM