more work on framework changes =)