Code audit again
yyan