New code, but still not in function