fixing function names to make more sense.