Putting them back into the function