changed back some functions to its previous state