Extended (and probably fixed) use_old_data stuff