the 4th submmit & some bug solved