working draft modifications AJP May 16 18:23