afsd-improvements-20040403