few more framework changes