These 3 lines are unrelated to this change, right?