fix bugs of my part again, wait for louis's fix.