changing back some functions