change these functions to their original form