Adding kaden's change that didn't appear in my merge conflict.