commit all the modification about refresh and more functions