Change function definitions