renamed functions to underscores