Add non-re-requested overlimits back in properly and tweak splitting