Pull Ben's recent framework changes 2

Pull Ben's recent framework changes