some framework changes