Pull Ben's recent framework changes