3.25 modify moduls and improve some problem