Forgot to correct two of the six functions