Proposed Modifications to the Draft 2007 AQMP