Is moving this down really needed? There are a few places where not moving this would reduce the diff...