updates from revision of 10/10/2013 r3679