What does this change actually do? Moving it out of this function