Didn't comment out the first function