re-optimize expand