Is this actually needed in this function now?