Updated to final revised copies of Quadris Plan