Put jeff's suggestions into AVA_VAN.1.3E. Still needs work.