updated 4.09.07 by KKO