changing function returns

still have some more to do.