framework changes to further streamline