change some fn to make code less